From: Jasper St. Pierre <jstpierre@mecheye.net>
Date: Fri, 26 Apr 2013 01:04:32 +0000 (-0400)
Subject: network: Use activeApChanged to get the initial active network
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~4265
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=e5f226612ebeb7f1dff1a5bd7bb481ed92cf6fd8;p=gnome-shell.git

network: Use activeApChanged to get the initial active network

https://bugzilla.gnome.org/show_bug.cgi?id=698918
---

diff --git a/js/ui/status/network.js b/js/ui/status/network.js
index 2cef443b9..9f53ce526 100644
--- a/js/ui/status/network.js
+++ b/js/ui/status/network.js
@@ -911,16 +911,7 @@ const NMDeviceWireless = new Lang.Class({
         for (let i = 0; i < this._networks.length; i++)
             sortAccessPoints(this._networks[i].accessPoints);
 
-        if (this.device.active_access_point) {
-            let networkPos = this._findNetwork(this.device.active_access_point);
-
-            if (networkPos == -1) // the connected access point is invisible
-                this._activeNetwork = null;
-            else
-                this._activeNetwork = this._networks[networkPos];
-        } else {
-            this._activeNetwork = null;
-        }
+        this._activeApChanged();
         this._networks.sort(this._networkSortFunction);
 
         this._apChangedId = device.connect('notify::active-access-point', Lang.bind(this, this._activeApChanged));